demos: Make desktop file names match the application id

diff --git a/build-aux/flatpak/org.gtk.Demo.json b/build-aux/flatpak/org.gtk.Demo.json
index a0c50855911190a469d30459f91f38bb24893593..ca655a7bd654f1b33decc34fba3545a2a33b80a9 100644 (file)
--- a/build-aux/flatpak/org.gtk.Demo.json
+++ b/build-aux/flatpak/org.gtk.Demo.json
@@ -5,7 +5,6 @@
     "sdk": "org.gnome.Sdk",
     "command": "gtk4-demo",
     "tags": ["devel", "development", "nightly"],
-    "rename-desktop-file": "gtk4-demo.desktop",
     "rename-icon": "gtk4-demo",
     "desktop-file-name-prefix": "(Development) ",
     "finish-args": [

diff --git a/build-aux/flatpak/org.gtk.WidgetFactory.json b/build-aux/flatpak/org.gtk.WidgetFactory.json
index c28acf426e45718a17ea1bbe1da09dbaae50119b..ea6aaa9938369e83f3f389c2a16ef77e6f3d9162 100644 (file)
--- a/build-aux/flatpak/org.gtk.WidgetFactory.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory.json
@@ -5,7 +5,6 @@
     "sdk": "org.gnome.Sdk",
     "command": "gtk4-widget-factory",
     "tags": ["devel", "development", "nightly"],
-    "rename-desktop-file": "gtk4-widget-factory.desktop",
     "rename-icon": "gtk4-widget-factory",
     "desktop-file-name-prefix": "(Development) ",
     "finish-args": [

diff --git a/demos/gtk-demo/gtk4-demo.desktop b/demos/gtk-demo/gtk4-demo.desktop
deleted file mode 100644 (file)
index 3ccd28d..0000000
--- a/demos/gtk-demo/gtk4-demo.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=GTK+ Demo
-Comment=GTK+ code examples and demonstrations
-Exec=gtk4-demo
-Icon=gtk4-demo
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index e626fae503f2edc1657546408c6c49d365eecba8..93c2902575c92a352896caf969e4331edbf6115e 100644 (file)
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -129,7 +129,7 @@ foreach icon_size: [ '16x16', '22x22', '24x24', '32x32', '48x48', '256x256', ]
 endforeach
 
 # desktop file
-install_data('gtk4-demo.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.Demo.desktop', install_dir: gtk_applicationsdir)
 
 # GSettings
 install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)

diff --git a/demos/gtk-demo/org.gtk.Demo.desktop b/demos/gtk-demo/org.gtk.Demo.desktop
new file mode 100644 (file)
index 0000000..3ccd28d
--- /dev/null
+++ b/demos/gtk-demo/org.gtk.Demo.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=GTK+ Demo
+Comment=GTK+ code examples and demonstrations
+Exec=gtk4-demo
+Icon=gtk4-demo
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Development;GTK;
+NoDisplay=true

diff --git a/demos/icon-browser/gtk4-icon-browser.desktop b/demos/icon-browser/gtk4-icon-browser.desktop
deleted file mode 100644 (file)
index 844de8c..0000000
--- a/demos/icon-browser/gtk4-icon-browser.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Icon Browser
-Comment=An application that shows themed icons
-Exec=gtk4-icon-browser
-Icon=gtk4-icon-browser
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

diff --git a/demos/icon-browser/meson.build b/demos/icon-browser/meson.build
index 95b1c0f4e410fd2a163989b1d2bc30aaee079ec9..fcaca82d8d3615f3bbece86a512e03f7aa5e5e27 100644 (file)
--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -17,4 +17,4 @@ executable('gtk4-icon-browser',
            link_args: extra_demo_ldflags,
            install: true)
 
-install_data('gtk4-icon-browser.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.IconBrowser.desktop', install_dir: gtk_applicationsdir)

diff --git a/demos/icon-browser/org.gtk.IconBrowser.desktop b/demos/icon-browser/org.gtk.IconBrowser.desktop
new file mode 100644 (file)
index 0000000..844de8c
--- /dev/null
+++ b/demos/icon-browser/org.gtk.IconBrowser.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Icon Browser
+Comment=An application that shows themed icons
+Exec=gtk4-icon-browser
+Icon=gtk4-icon-browser
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Development;GTK;
+NoDisplay=true

diff --git a/demos/widget-factory/gtk4-widget-factory.desktop b/demos/widget-factory/gtk4-widget-factory.desktop
deleted file mode 100644 (file)
index 685ebdc..0000000
--- a/demos/widget-factory/gtk4-widget-factory.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Widget Factory
-Comment=A showcase for GTK+ widgets, designed for testing themes.
-Exec=gtk4-widget-factory
-Icon=gtk4-widget-factory
-Terminal=false
-Type=Application
-StartupNotify=true
-Categories=Development;GTK;
-NoDisplay=true

diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index 2050d2e7507cc231cc217d56100955cf02c22996..be7b5db57a2fdfc9ba7c6dffb2ef98e8e86f4a45 100644 (file)
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -13,7 +13,7 @@ executable('gtk4-widget-factory',
            install: true)
 
 # desktop file
-install_data('gtk4-widget-factory.desktop', install_dir: gtk_applicationsdir)
+install_data('org.gtk.WidgetFactory.desktop', install_dir: gtk_applicationsdir)
 
 # icons
 icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')

diff --git a/demos/widget-factory/org.gtk.WidgetFactory.desktop b/demos/widget-factory/org.gtk.WidgetFactory.desktop
new file mode 100644 (file)
index 0000000..685ebdc
--- /dev/null
+++ b/demos/widget-factory/org.gtk.WidgetFactory.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Widget Factory
+Comment=A showcase for GTK+ widgets, designed for testing themes.
+Exec=gtk4-widget-factory
+Icon=gtk4-widget-factory
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Development;GTK;
+NoDisplay=true